Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

added shadow and average filters (backport #31) #33

Merged
merged 4 commits into from
Nov 12, 2024
Merged

added shadow and average filters (backport #31) #33

merged 4 commits into from
Nov 12, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 12, 2024

This is an automatic backport of pull request #31 done by [Mergify](https://mergify.com).

@pradyum @mergify
added shadow and average filters
5bed0f5 
(cherry picked from commit 208df64)

# Conflicts:
#	src/dual_laser_merger.cpp
@pradyum @mergify
added vector header and linted
eac5724 
(cherry picked from commit 831b426)
@mergify mergify bot added the conflicts label Nov 12, 2024
@mergify Mergify
Copy link
Author

mergify bot commented Nov 12, 2024

Cherry-pick of 208df64 has failed:

On branch mergify/bp/humble/pr-31
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit 208df64.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   include/dual_laser_merger/dual_laser_merger.hpp
	modified:   launch/demo_laser_merger.launch.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/dual_laser_merger.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@pradyum pradyum merged commit 334fa7b into humble Nov 12, 2024
3 checks passed
@mergify mergify bot deleted the mergify/bp/humble/pr-31 branch November 12, 2024 02:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pradyum pradyum

Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@pradyum